Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 12 Jan 2012 21:19:39 +0000 (13:19 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 12 Jan 2012 21:19:39 +0000 (13:19 -0800)

Trivial merge